From: Keir Fraser <keir.fraser@citrix.com>
Date: Tue, 22 Jul 2008 07:00:43 +0000 (+0100)
Subject: fs-back: fix compilation error.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14171^2~6
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=76db3435926875dc5d59b523299562705a9137a4;p=xen.git

fs-back: fix compilation error.

XC_PAGE_SIZE and XC_PAGE_MASK should be used instead of PAGE_SIZE
and PAGE_MASK.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
---

diff --git a/tools/fs-back/fs-backend.c b/tools/fs-back/fs-backend.c
index 22686b82b2..cdf3edbf0b 100644
--- a/tools/fs-back/fs-backend.c
+++ b/tools/fs-back/fs-backend.c
@@ -239,7 +239,7 @@ static void handle_connection(int frontend_dom_id, int export_id, char *frontend
                                     mount->dom_id,
                                     mount->gref,
                                     PROT_READ | PROT_WRITE);
-    BACK_RING_INIT(&mount->ring, sring, PAGE_SIZE);
+    BACK_RING_INIT(&mount->ring, sring, XC_PAGE_SIZE);
     mount->nr_entries = mount->ring.nr_ents; 
     for (i = 0; i < MAX_FDS; i++)
         mount->fds[i] = -1;
diff --git a/tools/fs-back/fs-ops.c b/tools/fs-back/fs-ops.c
index d55e956524..6315a4d975 100644
--- a/tools/fs-back/fs-ops.c
+++ b/tools/fs-back/fs-ops.c
@@ -515,9 +515,9 @@ void dispatch_list(struct mount *mount, struct fsif_request *req)
     /* If there was any error with reading the directory, errno will be set */
     error_code = errno;
     /* Copy file names of the remaining non-NULL dirents into buf */
-    assert(NAME_MAX < PAGE_SIZE >> 1);
+    assert(NAME_MAX < XC_PAGE_SIZE >> 1);
     while(dirent != NULL && 
-            (PAGE_SIZE - ((unsigned long)buf & PAGE_MASK) > NAME_MAX))
+            (XC_PAGE_SIZE - ((unsigned long)buf & XC_PAGE_MASK) > NAME_MAX))
     {
         int curr_length = strlen(dirent->d_name) + 1;